Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 06:23:18 +0000 (06:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 18 Aug 2010 06:23:18 +0000 (06:23 +0000)
commit26e98bffe51769fa3a8fa41097198f7b3c99c557
tree4b0c624e92efedb701b5bd25cb3803b81be0019d
parent851cbb2acfa2aa97691b7a98c2fcf81027179ba1
parent9f3fa304b018023dbb5e8790cfd3373b2edb0c52
Merge from mainline.